Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Nov 2011 06:08:30 +0000 (23:08 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Nov 2011 06:08:30 +0000 (23:08 -0700)

Trivial merge